Cleaned up the code some more
Attempted to add in fixed point conversions