Small tweak to Server to hopefully prevent deadlocks

Small refactor on Server as well; Version bump to 0.2.1