Added zepto and some minor modifications