Made fina tweaks and corrections