small fixes and all that business.