Starting to add textures and doing a little cleanup