make some command changes to work properly