v0.6 - Fixed stuff