bug fixes from Lance