fixed some stuff in FloatCanvas and added some optimizations
Merge remote-tracking branch 'origin/master'