All updates on scoring and java files