Added underscore to private method _buildOptions(). Added missing javadocs to methods.