lots of changes

huge moderation