Added a few of Dans changed from his mine branch
Added some of Dans changes