running changes, reference issues, general fixes