fixes, clean ups, Breeze