added more asshole macros

clean up stuff
gr8 m8