lots of tweaks, also fix goToHash() to work