Final commit, fixed all errors.