fixed some problems?