changed button mappings
fixed a little bug
some consts added.