updated interface, fixed error handling, fixed bug with activity choice