Pushing minor updates

Including db schema for marco