fixed several fixmes