Added some stuff, and fixed. NOT done !
Added stuff, fixed?, Error...