merged scaling first try
added in commit for coordinate fixes
switched the loop to have an escape
fixed merge conflict mistake
fixed font scaling
Merge branch '1.0.0-dev' into 1.0.x