reworked some of alfs classes to comply better with over code