updating to latest changes, documentation