Bug fixes. Optimizations. Code cleanup. Add ability to import timestamps with json