some more error catching and debug, more precise data extraction