Added more demos
Fixed some bugs having to do with blank lines at the end of the file.
Cleaned up code, bug fixes