update to core changes and small cleanup