fixed small disabling bug. Switched to conditional operaters for less lines of code. added other small things