Fixed a small dupe bug with the Itables xD and a few other changes