numerous fixes to make it work/look better.