Fixed and added a lot