fixed final issues