Minor updates, tracking down bugs

General clean-up; also trying to track down the issue causing #4