Added some notice messages and some few small changes