update and fix a few things