Small changes
Added -X switch for debug logging