Re-wrote context extraction and added proximity weighting