Repaired a few other errors and added additional feature to generic molecule script