merged keston's changes and modified docs