minor improvements, better loading messges