Changed some things in smash.java (this is a test commit for Egit)