a few fixes and updates