Public employees police and fire retirement plan; salary to be used for purposes of calculating benefits clarified and c ertain payments by the department of public safety required.