localization and some fixes on site model constructor