[TASK] Removed some small Bugs