various fixes
Merge branch 'develop' of github.com:IrisConstruct/iris into develop

Conflicts:
	src/main.py