some general fixes per @jagtalon 2014-02-24