Add some stuff and fixes