Merge changes for the sake of making progress

L1 / R1 still don't "work" but at least the ground work is present to get them fixed. The current setup doesn't cause any undesired results so having the prep there is useful.

The frameskip makes the visuals move faster, but is not an actual speed-up. This is again just the shell for a better function that left unused will not cause any harm.