updated main simulator, added some upgrade calculations