Markers and some bugfixes