whitespaces, unicode and import fixes