tweaks to index and server