Fix a few smaller problems and missing getters/setters