Server Enhancements

Merges in tons of fixes for the extensions and server.