Updated methods and minor errors