change some types; closes #48; closes #50