fixed some 3.1 issues + updated documentation