Comments

Added more comments to the code. Fixed merging issue. Uncommented localization files.