Add a few more story status indicators, small tag refactor