Some fucking fixes
fix
Merge branch 'GUI'