fixed todays issues