2013march/issues/314

fixes for issues (1) and (2).