Final touches on setup of ManualEdit