fixed more stupid mistakes