bug fixes 10 May 2014

bug fixes 10 May 2014