Address class extended. Some api refactoring, commenting & cleaning up