More updates to debgger