Bug Fixes

* Fixed server warnings
* Fixed Socket Master and added