big fix and return key another bugfix