some simple changes

The commits should be self-explanatory...