A few updates (including the cp fix the Craig has been looking for)
 -Erik
34 files changed