Fixed various thing + other useless comment