fix and add some stuff