some final updates (that I still only had on my local machine) for the FOSDEM 2013...