Add configs and small changes