miscellaneous changes, but decided against separate log module at this time