fixes from day 1