gameplay polish
polishing and bugfixing + gameplay