bug fixes (big and small), consulting worklog for more details