More console data and cleanup