Add some more dubug options