UPDATED v0.6.1-alpha, still more fixes to come