Added a few features and fixed a few bugs.  See C-Log