First pass corrections

No zip managment yet