fix + notebook enhance