Code cleanup, updated config based on early lab tests