switched back to less and some bug fixes