fixed comments and some layout cleanup