stupid mistakes fixed