more user changes
comment cleanup