General cleanup + readme update.