[TASK] General improvements in the process of rebaseing some stuff