some updates
updates up to 23-10-2014