modified the server
fix server
final tweaks
minor tweaks