1.4.8F,mostly cleaning+fix