[amends #107] [amends #104] [amends #102] Add multiple features/bug fixes to blocks