New markers
Fixed bugs