Builder & time range cleanup. Closes #2