quick fix and some comments