More formatting fixes, extended doc a bit