more stuff

passing 13
fixed stuff

passing 13