Updated cyvmath, some cleanup