and now for a long serious of small commits