tidy
changed class from being unnullable
Tidied, fixed minor bugs