javadocs, more tests, fixing and MapStringString support