tweaking some internal logic that was unnecessary, closes 17