fixed some minor issues to reduce technical dept.