Bunch of edits. Added testing on blocks. Don't forget to call blocks wit...

...h () if using them as variables!