a bunch of little fix