Minor fixes
Finished abm users with all needed generalizations