Review

Trying not to touch the server architecture much since you plan to change that, but fixed a few things