debug statements and cleanup
fix shorthand issue
0.1.8