[BACKLOG-195] Fixed a few small bugs and document formatting