minor changes
working on js
minor readme change
meh
working on js
merge conflicting changes...