format stuff
rework js
add comment latest fn