Fixes and Example updated