Little program changes and bug fixes;