status update improved, basic error handling added