[2013-November] Many small tweaks