added blocks

and some bug fixes