corrected input types
cleaned up js
all the things
morning merge
merge into dev
merge dev with bubba
merge
tabs updated