Fixed some lines (that were previously not done by me) and added...