Fixed omissions and stuffs