fixed, added and updated some things