Tried to make a playeable version, tweaks and bugfixes