comments added, locale working again