Config stuffs, hopefully bug fixes, etc.