Add more imports, few bug fixes