Updated config and some fixes.