fixed final touches