Preassessor fixes and test
making it work with variable reusal