making progress

fixed some bugs