Emergency commit
Corrected bugs with van_spec