Revised documentation, changed some default variables