refixing several import errors