Trying to make javascript more compatible
Added in support for short and long desc

The diff seems buggy.. I don't know why