update in one shot
smart_comment
removed unnecessary import
fixes after review
added source links