Some modules finetuning and correct version info