more minor changes, nothing very important