fixed command parser. Now will take functions and variables