Fixed spacing align,ment & additional checks

Hi, here are some fixes.

I tried to test it but the archive file that I downloaded would not open the archived file.