Broken code fixed, updates to docs
Clean ups and formatting part 1