Industry 07

more bugs fixed