Solved few bugs and made changes so that user can set some parameters