corrected input types
cleaned up js
all the things
morning merge