Fixed Numerical Errors

Still alot of visual issues, considerable tweaking required. Code
cleanup imminent.