Better error information
Import cleaning
Fixed annotation comparison