Tested a partitioning. Fixed typos in rest
Merge remote-tracking branch 'origin/master'