make XML parsing more strict when importing
a lot of refactoring... created simple store cache