changed methods to camelCase, fixed minor errors