Fix importing
Fix some bug, I guess