rename methods; streamline code; fix access to inexistent properties