Add demo project and fixed some models
Large Bugfix - Too many to list, see commit log