integrating wyatt's changes into LESS, etc