various 201404 bug fixes
more 201404 updates
a few more 201404 updates