Minor changes, added some thoughts I had over today