added unit popups and other stuff and things!