Cleanup, added overlap stuff.