General clean-up

Changed some MessageBox text, adjusted some comments, adjusted code
blocking