Render indicators and bugfixes