Lot of fixes and added some entries/textures