Fixing up bugs and errors and beginning demonstration