Evoluted import, corrected minor bugs on parsing