Updated and fixed some stuffs