Some tuning and little fixes