fixing more stupid mistakes