other fixes, but still 2/5