2014.6.6 a little tweaks