Changed license info, fixed errors, removed unused imports, began refactor