fixes - ready to merge