added simple server and some tweaks