Correction of small bugs, cleanup...