misc whitespace and dict() fixes