Issue52

Fixed some minor things