Few bug fixes.

Config files idea marked