More works...

This commit adds a few more things. However, the changes haven't been
tested yet; the server is still unavailable.