comm bug fixes, still doesn't work
more bug fixex