Minor update 29/11/2013

Some fixes and more