minor stuff, syncing with Armin
resolved merge conflict