rebase thermal and mp
final cleanup for the day