Minor fixes and additional documentation