Integrated with config file
changes changes idk
Some fixes for null pointer exception