improved transitions; added weapons upgrade