Fixes first run
finish fixes from first run