another part of fixes, almost there