Final touches to fix for cross platform, includes dropping framerate fix.