fixes - a lot