bug fixes - gui problematic