fixed some gaps