bug fixes cont.