updated documentation and fixed keywords getting overwritten.