minor
merged
running server; reduced logging