Some comments/small changes