updates in response to ideas/suggestions from @bltzr, @theod, @lov, and @laugre