lots of cleanup, added adding members to images to features