Refactored, commented, deleted extras, fixed errs