add command; bug fixes