Adjustments

Adjustments for comments and working directory.