Fix globs; code improvements