presentation and other changes
changes to server