Speed enhancements

Still some more work to be done to smooth out slower fps's