Freed up registers and fixed bool include.