fix some stuff
add some stuff