Introduced small changes and fixes.