small updates, working on database -> server integration