added more fixmes