Slightly better parse for tiva and added in switches