Cleaned up TODOs, marked breaking ones
Manipulate children arrays directly
Disable default mouse actions
Merge branch 'master'