Schema Changes, fixes Bug, Client Suggestions

Schema Changes, fixes Bug, Client Suggestions