new features and fixes

Back button works, but not completely.