Finalized build system & comments