Fixed overlapping, comments, cleanup