Serveral minor updates