Added some new switches to make it more configurable.