Begin implementing smarty scopes (not complete yet)<br />Minor bug fixes.