I fixed many things.
merge with rfrost
master pull conflict