Minor issue cleanups

Issues #99, #97, #96 resolved