fixes WIP
fixes WIP II
fixes I