Improvements, small fixes