Bug fixes, additional documentation