- Added docblocks and corrections