Minor Updates

Added more comments and a bit more debugging.