fixing some final bugs