BUG: fixed many bugs from the migration to Version 2.0.0
REL: updated version