Fixed small errors, moved things around.