added leganda and some minor cleanups