better handling on config stuff