last fixes before I head to bed to continue work tomorrow.