Made marks grouped by project root rather than server name. Also made lots of fixes / cleanup