polished up a few things