Made some changes to make it more javascript-like.
Added some more shorthand stuff.
Added some test for shorthand stuff.