misc. small cahnges