commit after merging deepak user fixes and my fixes of other modules