* new fixes, still borked tho