Added comments, switch and text view. Stable version