added command functionality
cleaned strpos functionality