Approved v1

Language and minor function changes approved by users - ready for production use