small performance enchancements; no back button fix yet