DOCUMENTATION! and some other changes