Add option to disable server-side rendering

Plus some misc. updates/cleanups.