markers and bugs fixes