Hotfixes
	-Preparations for demo, bringing branches together!