fixed a few remaining errors with imports and subspec dependencies