updates, fixes, comments