Small fixes and documentation

#361