cleaned up a bit. need to keep both presentations in sync now