made stuff good, server side still broken