Making build debuggable
Merge branch 'sohrab'
Performance enhancements + TODOs
new logger