Start adding in-game configuration and fix bugs