Fix board routing (fixes #1), fix state batching not saving, put keys up in some components