Debbuging and fixing imports