more stuff on 4.0.6a 

hopefully we won't have any compiling errors