better originInfo handling; couple small fixes