Rewrote bundle statement logic 

Reduce shift/reduce error by 1. we have now better error reporting for wrong bundle statement and added  constraint token test.