overdue edits, bugfix in main