Minor changes, progress on actual calculations