Clean up todos/fixmes
Add more user resources