Many small fixes based on review