Merge edits from error handeling, scale and feature fix branches
The scale and feature fix branches were merged into errorHandeling, which then is merged to features
The scale and feature fix branches were merged into errorHandeling, which then is merged to features