New hashmap; very simple implementation
Various fixes on the client