Commit Fixes

Fixed all errors from the refractoring commit made a little bit ago