bump version
minor refactoring
fix xml bug, and general refactoring
bump version