fixes from bee9f377bc547c99fe99b4e38199cb92cf668554 commit notes

there! :+1: