Small updates, and first commit to github for this.