Updating comments and such
More cleanup of code, deviation handeling