Added commits fixed some bugs, all in a days work. ;)