A Big Update of a lot of functionality