Bug Fixes, comments refactor and share image