Clean up + fire detection + documentation