fixing some data structure issues with users