some overdue commits of some minor changes