put into command, pickup window generalization,  some minor fixes, fix #42