add pretty limits, consolidate some input files