Fixed some values
Switched to switches and cases
Adding last minute stuff