0.0.1 - will_painate fixes