fixed stackoverflow. cleanup of commits