addresses all to-do items in #145