Fixes #145
Fixes #144
Fixes #152
Fixes #153
Fixes #137
Fixes #139
Fixes #143
Fixes #138
Merge branch 'fixes/graphics' into develop