More and more changes for comments and variables :)