Added indicators and basic error handling

Ready for field testing! :)