removed a bunch of logic from writer and added hybrid support for angles and dihedrals