update to fix a few bugs