minor sigfaults fixed