small bug fix and typo

Hi, in this I've added all the small bugfix i've found