Config pass

Very basic, another bugfix sweep