Fixed several of the problems.
Please enter the commit message for your changes. Lines starting