cleaned a bit, relying more on coffeescript features
fixed addProperty and embed