many part of fixes (tl;dr;)