Bugfixes
Render indicators and bugfixes