I fixed few things