Fixes #167
Fixes #173
Fixes #158
Merge branch 'fixes/graphics' into develop