Typo
slight js tweaks
fixed merge conflict
minor updates