Fixed restriction and renaming... also fixed minor parser bug and improved highlighting... :)