fixed and added things