fixing some final issues