Fix almost all of the gap and overlap problems