server and comments changes. kinda works