Fix 2d bug and improve chemical structure