minor fixes during testing
part 1 of #36
fix #36