several misc updates