added FIPA ams agent and some cleanups