Added bootstrap, server tweaks