block fixes and refactored @user to current_user
Merge pull request #23 from Ch4s3/block_fix

block fixes and refactored @user to current_user