Looked at couple of bugs