Implement more config settings + more polish