Commit of some minor changes: note this package is still in rough shape