only a few changes, but more progress towards improving the code