few final touches of error handling and navigation.