post-deadline changes, see ReadMe under bugs