Fixes + Added documentation