Fixed methods. Added constructors.