updates. fixes and stuff