v0.12a

very simple changes here, not outlining them, i just moved some stuff
around