fixing some things
after mergging