Use nicer names in test2.m
Uncomment atom and shellType parsing
Add overlap code