Added initial setup and updated config handling
minor formating cleanup