tweeking server
merged from github