Fixed some errors and interactions between classes.
Merge remote-tracking branch 'origin/master'
Removed Roots