added blocks and fixed stuff

1337