Push 8/11 2

Bug fixxes