fix strict mode bug, some cosmetic fixes