Updates to FinalApp2 and FinalServer