a few fixes made