Hopefully O.K. and Final Merge

Fixed previous merge issues