Condenser

updates and small re-factoring to Condenser, also some cosmetics and TODO review.