More bug fixes and demoable project
some changes