49614315 fix load error

Squashed commit of the following:

commit 1ee82b881c2f3c59ad615c8c5a45b34d40d1827e
Author: Brad Reid <bradreid20@gmail.com>
Date:   Thu May 16 14:03:08 2013 -0700

    loader fix;  log file fix