Adding more tweaks and fixes