Small tweaks and minor modifications.