fixed few things
fixed few things