Fixed and added things