added option default
Small changes added
typo fix
bugs fixed and code improvements

Also added comment delete feature