added multiple command support, as well as more checks on adding these.