improved Future names and error handling a little