[FIX] Changes to server side handling of requests
[ADD] Client side enhancements