+new line bug fix +reformatting