updating selpol and other cleanup