Added stuff fixed stuff