Some version updates and minor tuning