minor changes
beginning to prepare for server