pushing a couple of changes that fixed some bugs