Added stuff and fixed stuff