Making a few amendments hapa na pale to iron out.

Thanks wenye wali point out bugs. All fixed now.