removed mentions and other fixes