few functionalities

some changes