Some refactoring, starting a simple XML serializer, text updates