Added some configurations and fixes