Bugfixing and todos for next improvements
other todos