2nd commit - minor updates