A lot of stuffs. It have been a while since my last commit