login added and some changes