More fixes little fixes now testing it