Some small updates, plus making key controls configurable.