3/15/13: commit leftover changes