hopefully some final touches