fixed some 18a bugs