Reviewed documentation + Some code fixes