Fix for issues #42 and #43

This includes modifications to two operations

closes #42
closes #43