Some fixes/changes, got a working game