Solved minor issues and updated docs