fix problem with order of commands on initialization
get rid of some warnings