Fixed some details about scopes and variables and constants :) thanks Lorenzo for your helpgit status