heterotrimeric ring and snake models added + some little fixes
merged some changes