Re-enable api server, final touchups