alot more command bug fixes