Basic wiring for combos and a bit of general cleanup