Added on dispose and changed main
Removed some TODOs

Added them into the GITHUB issues
Merge branch 'master' into Bug-With-Enter-Button