getting ready to fix some bugs