Lots of bugs fixed in PSAP Simulator