Fixed some minor bugs
Merge branch 'feature/struct' into develop