tweaks and debugs for start of Spring 2013 semester