hopefully special commands are parsed properly now. Still needs more love.