Various changes made re: #156