fixed problem with assertions, more hashmap stuff