Change Mathimatics to Switch & Fix Some Minor Bugs