Minor changes and improvments.