renaming primitives: lambda -> fn, atom -> atom?
minor improvements
minor improvements