few tweaks and bubndles