Final touches, minor fixes