added --with-manual option. Minor fixes