Cleaned up, adding more. Will merge some with main pinmux as there's a lot of redundancy