fixed some importing issues