Add some more content to implementation section
Fix small things