Helptext fix & bug removal