Add features and fixes as discussed with Ce.