solving errors
many fixes