updating tweaks and fixes