Simple bug fix and typo stuff