Added uname and a little rearrange too.