added several fixmes
fixed some minor issues