More ARM7 clean ups, it's finally starting to look the way I want it to!