fixes and additions to guidelines