Minor changes, committing in-order to continue working at  base.