Content updated and few bugs fixed