minor improves, fetch still not working