Cleanup manage.py
Fix "mark" action