few fixes and goodies