fixed some path and import issues