Tested a partitioning. Fixed typos in rest