updates from 2013.10.18

various bugs have been fixed