made server process things faster
added a TODO