General fixes, including fixing programmming error with ValidHashStore.java