Comprehensive crime bill under review in Annapolis