Thin Server + minor changes