Added some more config options - and it rocks