some small changes. blah. still in dev.