Added waves, updated GUI