Fixed stack overflow, added strings/controls