Small fixes to directory more to come.
Fixed submit errors on some systems.