Okay I will fix these few things and make a commit here in a few minutes.