Yes. Both of these are fantastic.

I still procrastinate like crazy sometimes though, so I'd add to this small list a book called the power of habit. This is the missing link on how to make your behaviour automatic.