finished config and added a few other things