cleanup, bug fix _WAK 10.8.5/10.9