[✔] Bugfixing / Optimizations.