Added borders back in, changed FPS cap to 40