solved some problems