fixes, panic commit