making more changes

Forgot to include basic atom types
Figuring out why blanks aren't being replaced