fireall changes, button swaps