[TASK] General Improvements