solved some problems, more to come