improved parsing of 2 more raw commands