Fixed small issues.
Finished correcting small issues.