general cleanup, start configuration overhaul