tweaks an d bug fixes