added bitly url gen, also fixed calculations