Consistent status names and custom markers

Closes #110
Closes #97