add some stuff
fix some stuff