General cleanup, simplified WDT disable, combined lockout logic to optimize, fix bug preventing light sleep