Modified/added a bunch of things... + Minor fixes - cleaned it all