Added and updated some stuff