Cleaned up and reconfigured some areas.