Made small changes and fixes.