some fixes
subchanges
subchanges