adding rickshaw and lots of other fixes