- fixed some problems