Alpha 0.5.0.2

un fucked up more stuff