Small updates and comments