Added word separator and fixed up some action parsing