updated stuff
fixed merge issues
updated JS to display data