adding fixmee, small fixes