completed client said corrections and merged mathi changes code
