Refactored addGettersSetters and validate functions; Misc. bug fixes