less compilation integrated, minor fixes
less compilation integrated, minor fixes