Release/pebbles/master

small syntax fixes that allowed me to apply the proposal again