I fixed few bugs.