Fixing

merge in fixes from fixing branch