Fixed starting position and other bugs