added another batch of fixes