Formatting and CM addition

Merging recent commit. Forgot to mention I also added the parallel axis theorem.