Various bug fixes
Big fixes, gives the illusion of being playable