More details. Fix little bugs
More details. Fix little bugs