last Adjustments

Looked over everything. Added Ternary operators where I could.