Update documentation. Added context fix. Some bug fix and other inconsistencies.