fixed constructors, added getters and setters