Removed client thread
Some interface work
+ minor stuff