more minor edits/bugfixes