Bug fixes: closes #70; closes #69