Fixed more stupid mistakes; All set