Fixed 2 bugs already.