locations and subjects updates
some error handling