Sub Final changes, errors fixed