Fixes and Demo Input