Added a bunch of new content, features and fixed