few more command fixes & shit