bug fix
Added space partitionning and many cool stuff