more & more bug fixes

more & more bug fixes