(MESS) apf : WIP - fixed a few bugs