Added current_pms; fixed other broken features