added stuff, fixed stuff