bugs seem to be fixed