bugfix: tampered my own classes
bugfix: minor errors within the annotations