fixed misnamed classes, added methods