fixing some final things