Debug mode, more data, small fixes