build updates, and lightning support