title change, clean up etc