Bug fixes, comments