added combos and slightly altered input handling