overhaul a few things