Cleaned up some comments and removed 'current buffer' from controller
Merge branch 'BufferChange'
Beefed up documentation and removed some unused functions in the controller