Clean up, set useful things via pillars, add comments and sources for files