more cleanup and added strated multiple bond support