added some facepalm
moved some stuff around