Core game improvements

Skiwi's improvements