Server Fix #1

Some problems regarding the prxy, but it's fixed now