Fixingsmallissues in #26