V .04

First cleanups for Release. Release for me is .1... in my head there is
never a v1 as no code is ever done :D