fixes - additions