Merge #24 Added Moderation and fixed functions