more bug fixes....