Some bug fixes, some bugs left
Merge branch 'workshop' of github.com:MrKepzie/Natron into workshop