some new tweaks bug fixes