Minor improvements

Update+Minor improvements