Updates to issues #15, #25, #30