solved some little errors #go-on