Added new features and updated some things