Resolved errors and updated Treatment Plan logic