added a few UI controls, some general upgrades