Fixes, changes and stuff (0.6 Alpha 1)