kris's fixes for 10-21-13