additional mods addressing #1 and #2