Various fixes incl. remove tags, cats