Cleanup
Some problems fixed

When creating a new project derived fro this one, this needs to be set.