Fixed minor bugs, added PNG import option