bug fixes - still issues